From 41539e5cd6cc9eebfc9bfa0a1d626b1d74dafd37 Mon Sep 17 00:00:00 2001
From: oliskoli <oliskoli>
Date: Thu, 7 Dec 2006 19:34:22 +0000
Subject: [PATCH] Use 'get_filename' to extract filename from portname.

---
 magproto.c | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/magproto.c b/magproto.c
index ba41189cf..c23a529a7 100644
--- a/magproto.c
+++ b/magproto.c
@@ -489,15 +489,10 @@ retry:
 			/* These tracks don't have names, so derive one
 			 * from input filename.
 			 */
-			const char *s = strrchr(curfname, GB_PATHSEP);
 			char *e;
-			trk_head = route_head_alloc();
+			const char *s = get_filename(curfname);
 
-			if (s) {
-				s++; /* Skip path delim */
-			}  else {
-				s = curfname;/* use name intact */
-			}
+			trk_head = route_head_alloc();
 
 			/* Whack trailing extension if present. */
 			trk_head->rte_name = xstrdup(s);
@@ -740,12 +735,7 @@ mag_rd_init_common(const char *portname)
 	 * make a copy of it, then lop off the file extension
 	 */
 
-	curfname = strrchr(portname, GB_PATHSEP);
-	if (curfname) {
-		curfname++;  /* skip over path delimiter */
-	} else {
-		curfname = portname;
-	}
+	curfname = get_filename(portname);
 
 	/*
 	 * I'd rather not derive behaviour from filenames but since
-- 
2.30.2